Skip to content

feat(model-availability): introduce ModelPolicy and PolicyCatalog #13751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
adamfweidman merged 3 commits into from
Nov 24, 2025
Merged

feat(model-availability): introduce ModelPolicy and PolicyCatalog #13751

adamfweidman merged 3 commits into from
Nov 24, 2025

Conversation

@adamfweidman
Copy link
Collaborator

@adamfweidman adamfweidman commented Nov 24, 2025

Summary

This PR introduces the ModelPolicy and PolicyCatalog to enhance the management of model availability and fallback behavior within the CLI. It provides a structured way to define actions and state transitions based on different model failure kinds.

Details

The primary goal is to provide a flexible and configurable mechanism for model fallback, user prompting, and error handling. This allows us to easily control how gemini-cli should act in response to quota limits, capacity problems, or transient errors per Model.

Related Issues

Fixes https://github.com/google-gemini/maintainers-gemini-cli/issues/1073

How to Validate

npm run preflight

Pre-Merge Checklist

  • Updated relevant documentation and README (if needed)
  • Added/updated tests (if needed)
  • Noted breaking changes (if any)
  • Validated on required platforms/methods:
    • MacOS
      • npm run
      • npx
      • Docker
      • Podman
      • Seatbelt
    • Windows
      • npm run
      • npx
      • Docker
    • Linux
      • npm run
      • npx
      • Docker

@adamfweidman adamfweidman requested a review from a team as a code owner November 24, 2025 17:50
@gemini-code-assist
Copy link
Contributor

gemini-code-assist bot commented Nov 24, 2025

Summary of Changes

Hello @adamfweidman, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request establishes a robust framework for managing how the CLI interacts with different models, particularly when facing availability issues. It introduces a policy-driven approach to define fallback actions and state transitions, ensuring a more resilient and configurable system for handling various model failure scenarios like quota limits or transient errors.

Highlights

  • Introduce ModelPolicy: A new ModelPolicy interface is introduced to define how the system should react to different model failure kinds, including actions (silent/prompt) and state transitions (terminal/sticky_retry).
  • Introduce PolicyCatalog: A PolicyCatalog is added to manage and provide ordered chains of ModelPolicy objects, allowing for flexible model fallback behavior based on configurations like preview mode.
  • Structured Fallback Behavior: This change provides a structured and configurable mechanism for handling model availability issues, such as quota limits, capacity problems, or transient errors, by defining specific actions and state changes per model.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist[bot]
gemini-code-assist bot reviewed Nov 24, 2025
View reviewed changes
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces a well-structured ModelPolicy and PolicyCatalog system to manage model availability and fallback logic. The changes are clear, well-tested, and provide a flexible foundation for handling model failures. The separation of policy definition from its application is a good design choice. I have one suggestion to improve type consistency in getModelPolicyChain.

@github-actions
Copy link

github-actions bot commented Nov 24, 2025 •
edited
Loading

Size Change: -2 B (0%)

Total Size: 21.2 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 21.2 MB -2 B (0%)
./bundle/sandbox-macos-permissive-closed.sb 1.03 kB 0 B
./bundle/sandbox-macos-permissive-open.sb 890 B 0 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB 0 B
./bundle/sandbox-macos-restrictive-closed.sb 3.29 kB 0 B
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B

compressed-size-action

sehoon38
sehoon38 reviewed Nov 24, 2025
View reviewed changes
@adamfweidman adamfweidman added this pull request to the merge queue Nov 24, 2025
Merged via the queue into main with commit 87712a0 Nov 24, 2025
22 checks passed
@adamfweidman adamfweidman deleted the afw/avail-2-infra branch November 24, 2025 23:19
mboshernitsan pushed a commit that referenced this pull request Nov 25, 2025
@adamfweidman @mboshernitsan
feat(model-availability): introduce ModelPolicy and PolicyCatalog (#1…
5bafb1d 
…3751)
thacio added a commit to thacio/auditaria that referenced this pull request Nov 26, 2025
@thacio
Merge Commit '87712a0': feat(model-availability): introduce ModelPoli…
750d8b5 
…cy and PolicyCatalog (google-gemini#13751)
danpalmer pushed a commit to danpalmer/gemini-cli that referenced this pull request Nov 29, 2025
@adamfweidman @danpalmer
feat(model-availability): introduce ModelPolicy and PolicyCatalog (go…
3051425 
…ogle-gemini#13751)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sehoon38 sehoon38 sehoon38 approved these changes

+1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@adamfweidman @sehoon38